bad conflict resolution, fixed