fix some problems from previous conflict resolution