Added feature1
Added feature2
bug fixing
Added additional features to feature2
fixed conflic