fixed few merge problems