Stupid Tortoise git conflict resolver