[peeters]

This makes me wonder about how legislators deal with merge conflicts. Since new laws are often written as "Act X of 1972 is amended as follows: ...", I wonder if there are ever cases where two laws are in the House at the same time that would conflict, and how they resolve this. Do they amend the later law once the first has been signed/given assent?

[walshemj]

The way it should work is that any conflicts that require changes are noted in the motion - by the clerks drafting the law.

If you pass motion A implementing this new law the Law x and Z a deemed to be negated or changed appropriately.