added some line to the end
merged a change