Trying to make overlay
Resolve conflicts