reverted some merge conflicts because it didnt work with the merge