Bump vesion to
Conflict test
fix conflict
Edited from development branch
Issue pr test

Conflicts:

	newfile.txt