made very few changes
fixed merge