Removed conflicting files