worshop day 1
conflicts removed