resolving more conflicts