fixed someones leftover merge errors