Missed 'end' when merging