:help merge


do
dp

VIMdiff is an amazing too for merging.