Merge Conflict error, lost overlays design colors