commenting out uneeded parts, and adding c-x c-x for set mark
merge conflict fixed, new mark shortcut and shellscript snippets that don't work