merging step to master