fix the error due to merge conflict