Merge branch updated