fixed pesky merge conflict