added resource sending to gui
fixed merge