Fix error introduced in merge