fixed issue after merge confilct