change code accordingly for the file conflict