Resolve conflict to ccsfif.sql (3)