hopefully fixed merge conflicts