[IMP]: Remove conflicts