merging other people's changes