finally fixed all merge problems