resolving non-conflict