fix error occured when /pull/merge branch is not found
simplify edit request
change conflict check system