Fix bad conflict resolution

References issue #6