fixing merge 2/2