Added line drawing functionality
Fixed merge conflict