Merging master to the branch