Add missing end statement
Fix merge conflict