update linux commands notes
resolve merge conflicts