merge confilcts