Remove return and resolve merge conflicts
e0e734f
Since last execution statement is the value which is returned, return keyword has been removed from method strict_origin and strict_origin_when_cross_origin. Merge conflicts in Cargo.lock has been handled