beginnings of the master process
jesus christ merge conflicts