updated overlay
fixed conflicts