Creating conflict...
Resolved conflict.