adding another2.txt while Im in feature bran
modified some.txt while being on feature another2
another2 feature - testing pushing
next commit
Merge branch 'feature/another2' into develop
Merge branches 'master' and 'develop'

Conflicts:
	some.txt