15-merge.t: Added tests cases for merging (WIP)