Don't have Telegram yet? Try it now!
https://codeyarns.com/2016/04/11/how-to-resolve-git-conflict-with-binary-files/
How to resolve Git conflict with binary files