Change merge to reset --hard to avoid popup commit message