add other-feature2 in branch other-feature
edit masterfile