With that said, I really do like Tablinum! I might need that for something else. How are merge conflicts handled?