added stuff
localy added crap to conflic with romote
fixed the conflict