deleted first line
fixed merge