Bugfix: missed a conflict