Error: (XID h2u2uf) “/usr/local/cpanel/3rdparty/bin/git” reported error code “1” when it ended: error: Your local changes to the following files would be overwritten by merge: units/zerg/alkaj-chasm.yml units/zerg/alkajelisk.yml units/zerg/basilisk-den.yml units/zerg/basilisk.yml units/zerg/broodling.yml units/zerg/chasmal-colony.yml units/zerg/defiler-mound.yml units/zerg/defiler.yml units/zerg/devourer-haunt.yml units/zerg/devourer.yml units/zerg/gorgoleth-apiary.yml units/zerg/gorgoleth.yml units/zerg/guardian-roost.yml units/zerg/guardian.yml units/zerg/infested-command-center.yml units/zerg/infested-geyser.yml units/zerg/infested-terran.yml units/zerg/kalkaleth.yml units/zerg/kalkath-bloom.yml units/zerg/keskath-grotto.yml units/zerg/keskathalor.yml units/zerg/larval-colony.yml units/zerg/lurker-den.yml units/zerg/lurker.yml units/zerg/mutalisk.yml units/zerg/mutation-pit.yml units/zerg/queen-nest.yml units/zerg/queen.yml units/zerg/scourge.yml units/zerg/spire.yml units/zerg/ultralisk-cavern.yml units/zerg/ultralisk.yml zerg.php Please commit your changes or stash them before you merge. Aborting