check out conflic on linux
fix branch dev conflic