fixed minor conflicts