there is a wondering issue! my branch name is development that has a conflict with master and on the other hand, I have a branch as production name
my branch name is development that has a conflict with master
production