commit before pull.
Fixed merge conflicts on my laptop.