Rank restaurant xml + merge conflict