fixed missing end after merge
resolves code mismerged