Cleaned up conflict.

Double Overhead it is!