fix weird file conflict