took out merge artifact from dev, should be okay now