commit before pull
update before pull; hopefully merging branches