Finally sorted conflicts.