Fix missing line after merge conflict