fixed incorrect conflict status code on reject quote
Merge branch 'master' into dev