merge jays into dev