Merge confilct solved