added NetworkTest Unity project
empty conflict fix