use pull instead of merge, despite not really being sure how it works