better messages again

I merged with HEAD but still getting merge conflicts.