fixing merge 2