Added some magic to detect manual merges