How to update Parity if it was installed from source?

I've been running parity 1.7.8 and am trying to update to the newest patched verision ( due to the latest security threat ). The Parity github page doesn't mention how to update parity if it was installed from source.

I've ran git pull to pull down the latest code, but that just results in a bunch of merge conflicts. Can someone point me in the right direction?

Submitted June 06, 2018 at 08:40AM }
via reddit