Removing Conflicting Files