fixed merge inconsistencies