finished branch slide, added conflict slide