Fixed merge issue

Parts of the merged file were left over.