Recommitting the changes I made
Fixing Merges