Fixed dictionary merge problems