Resolving conflicts...