Forgot to fix one merge conflict in last commit