Merging work from old ticket branch to new one based off the latest sprint branch