"fix new line conflict"