Recording .gitmergeinfo Changes
Fixing merge