Merging master to branch