manually fixed merge conflicts