Fix file conflict that is still generated from RPM generation