z index tweak
settle merge conflict