fix bad conflict resolution and improve doc