merging formularium branch