make confilc info in new branch
make conflict