Adding feature-2 inside class1
Adding more code
Continuing feature-2
Fixing merging problems : nothing changed, just letting feature-1 and feature-2