fixet conflicts Dina 2