merge the conflic