add solution and fix merge issues