Things I did before realizing I'd made newer changes on my laptop.
Fixed merge conflicts.