merge commits with other people