merge differences between github and cadc repos