Fixed merge. Removed overlay