removed leftover merge conflicts