fixed all conflicts