test resolving conflicts