bugfix: fix somehow having committed merge conflicts