Made my conflict edit