fix others conflicts