merge branch salman to master