New change
Merge develop and resolve conflict

Merge branch 'develop' into new_branch

Conflicts:
	main.c