Get Merge testing for csci306