a change on the newfeature branch
another file on the new feature branch
third file aded
merged changes from master, fixed conflict in jason.yay