Merging after checking for a existence of the required order's number and fixing a bug of incorrect reference to the order