git merge -s subtree --squash --no-commit master, resolved merge conflicts