fix merge conflict
merge lesias fuckups