Add 'end' that was removed in fixing merge conflict