Merging beanstalk changes