fixed all the constraints conflicts