prep for merge after mentor meeting