Correct files to replace incorrect one from last merge