conflict solved.

DO NOT input TEST files in branch 'develop'!!! -0-