fix conflict in units file