edited old merge conflict messages.