vertical slicing!
resolving conflicts