Fixing weird stuff in git