correcting bad conflict resolution

This should be the correct form, not that in the previous commit.