Add conflict resolution. Fix slides order.