Fixed conflicted merge

This case was handled in the first branch of the if.