cleaned up code after a merge conflict debacle