temp commit to test java program to nodejs server
fixed conflicts