user 2 edited conflict file
solve conflict issue