Merge all of kyle's designs into master