fix dsl merging