resolve the code conflicting