When you merge a revision with the current, all data will be retained from both versions and merged at its approximate location from each revision. After this, it's important to do a manual review.