[PATCH] More descriptive messages for conflict cases in merges