(GitScripts3) made merge less annoying