removed binary files from repo`
remove backup file
remove merge conflict files