Removed conflict marker I overlooked