Merge conflict after git pull: Forget about the local version and take the remote one…how?

Question

I cloned a repo, build a firmware from that and \'git pull\' from time to time to stay uptodate. This time I got a merge conflict for a very huge file (json), which - as it