Trying to resolve conflicts...
More conflict resolution...