Cleaning up git
Fixing merge conflicts