Removing conflicting file with origin