merging writeup