Solved merge