Obey sort order fixmerge

According to #680