Add the simple scripts I used to do a merge with content conflicts.