manual merge of phusion