fixing compound names
fixing compound names; conflict reso