fix z-index bug
resolve conflicts