rejecting a few changes from merge