committing to merge with the necessary files Gavin sent