Merge/Sync bug in git...