second part
fixed merge