fix constraint conflict