fix add flow
remove line
resolve merge conflict