Removed conflict lines and the old duplicated line