Conflict Code
erge branch 'development' of github.com:amjadrana05/aits_git_practice into development

Conflicts:
	conflict_page.html

	# with '#' will be ignored, and an empty message aborts the commit.
	# On branch development