Removed some merge lines.