Solved merge issues