Fix dictionary merge