Added some syso via eclipse
Fixed Conflict
Merge remote-tracking branch 'origin/master'