fixing inconsitencies with GIT