Changes made to the dummy branch
Changes made to the master after branching
Changes resolved