removed merge
fixed merge