correction merge 2