This page is a placeholder for some guidelines for dealing with merge conflicts.