commiting new complex features 1 & 2
merging conflicts
merging conflicts