fix duplicates in files ? git-merge or rebase fuckup