Git Merge Doesnt See Changes