Adam/resolve merge conflicts

To fix the test, you need to change 18->20 and 16->17.