fixed z-index issue
fixed merge in css