fixed deploy errors
merged