[IMP] Resolved conflict