Git Merge No Merge Commit