removed duplicates
fixed merge