Update/merge commits from parent