Fixe merge bug, modify mouse z index