Fixes merge conflict from #163