fix from bad conflict resolution