fixing Tory's merge conflict conflict