"commiting so that I can pull"
after fixing merge conflicts. hopefully