Z order and basic animation
z order
edit conflict
rebase miss
edit conflict for linux