[IMP] resolve conflicts