merge master @wrkspace
merge child wid parent