Correct syntax outside of tests
Resolve merge conflicts