prep to pull
merged our work