Finishing making changes from previous commit