Commiting the merge
Cleaning up the mess