Removing leftover merge conflict