Solve ALL the conflicts

Let there be peace.