mistakenly added end in merge