Solving my git mess