more progress on merging