First code
implementing feature branch
Merged branch with fix
merged new feature