*.conf diff merge text