Add stuff to git that wasn't before
Get rid of conflicting copies
Remove another conflicted file