Fixed "<<<<HEAD" line left behind from manual merge