insuccessful merge

due to null expection by data adapther