Cleaned up git merge junk additions