fix merged comments