deleted some conflit bckup files