resolved conflict?