GitHub Desktop: "This file is empty"
<p>The file <code>naaclhlt2016.tex</code> is not empty on the client or in the repository, however GitHub Desktop displays "This file is empty". What could explain this?</p>

<p><a href="https://i.stack.imgur.com/9rR6Q.png" rel="noreferrer"><img src="https://i.stack.imgur.com/9rR6Q.png" alt="enter image description here"></a></p>

<p>The file <code>naaclhlt2016.tex</code> is present on GitHub repository:</p>

<p><a href="https://i.stack.imgur.com/SeCeC.png" rel="noreferrer"><img src="https://i.stack.imgur.com/SeCeC.png" alt="enter image description here"></a></p>

<p><code>git status</code>:</p>

<p><a href="https://i.stack.imgur.com/TIHgS.png" rel="noreferrer"><img src="https://i.stack.imgur.com/TIHgS.png" alt="enter image description here"></a></p>

<p>It creates conflict when I try to sync:</p>

<p><a href="https://i.stack.imgur.com/8JoeF.png" rel="noreferrer"><img src="https://i.stack.imgur.com/8JoeF.png" alt="enter image description here"></a></p>