premerge
finished post merge
fixed linux dependencies