resolve conflict
Merge pull request #495 from cutedemons/master

	resolve conflict