Trying to fix my git-mess