dist_url updated. git_source updated.
resolve conflict?