Resolving conflicts?

i guess???