Yeah the app was TERRIBLE at handling merge conflicts and errors. I loved the app until that happened and it would get in a bizarre state and stop working for a

Yeah the app was TERRIBLE at handling merge conflicts and errors. I loved the app until that happened and it would get in a bizarre state and stop working for awhile. Hopefully this fixes it.