Fix merge confilicts