merge from master during deploy