Git Merge Not Getting All Changes