First feature
Modified the first feature
Testing the second branch
Merged all branches