resolved conflict with historic