test 2
pull script
Merge branch 'refs/heads/develop'

Conflicts:
	index.html
index change
Merge branch 'refs/heads/develop'