removes conflicting files from master