Clarify what is up with conflicts on prod merge