resolved conflict with tables