merged changes from a local branch