Added easy upstream merging