adjust 2 merge problems home