Added the code for 3-way merge, need to complete this