commit before merge
post merge conflicts
I think I actually fixed the spellcheck. It doesnt seem to lag on lines anymore. ill need a poor speller to test this.