fix order of operations merge regression