line clipping added
merged