Fixing merge 2