Fix overlooked merge conflict