merge two conflict