git checkout a8cc445 # go to last master commit before conflicts
git checkout -b master-clean # creating a new clean master branch
git checkout fix-folders # go to fix folders branch
git checkout 11d2107 # go to the last good commit in the fix folders branch
git checkout -b fix-folders-fix-merge # creating a fix-merge branch
git merge master-clean # merging the clean master branch into fix-merge branch
nano php/classes/UserWsTransfer.php && git add php/classes/UserWsTransfer.php && git commit -m "add spectra" # manually apply the "add spectra" patch
nano generic_data/migration/Functions.xml && git add generic_data/migration/Functions.xml && git commit -m "new functions" # manually apply the "new functions" patch
git merge master -s ours # merge the actual master branch into fix-merge branch but with "accept mine" strategy
git push origin fix-folders-fix-merge # push the fix-merge branch in order to create this pull request.