Change to force accept changes from top of tree during the merge