all is well

first merge of a successful feature