All q1 tests pass
Fixed merge conflicts