resolving leftover merge conflicts