merge confilct fix