merging master to the branch