removed merge problems