commiting complex mod started
commiting new feature1 & 2
commiting new complex features 1 & 2
merging conflicts
merging conflicts
merging conflicts
commting complex modification ended
commiting complex mod ended
merging conflicts
merging conflicts
merging conflicts