Remove usage of the #[merge] hack with int modules
Remove the #[merge] hack from the parser