Fix error on merge