#163. Removed unmerged lines.