merge confilct commit