Atempt to fix the mergetool's derp
Merge branch 'master' of github.com:DesertBot/DesertBot