New ticket style
resolving conflicts