add feature 1
fixed merge conflict from feature1 / feature2
merged master into feature3