fixing bad conflict resolution after merge