Fixed conflict remnants.