merge master with child at wrkspace