Removed files due to content having conflicts