ehh resolving conflicts, ignore