merge workshop2