Comment 1 for bug 616130

If you are talking about the "./around-desktop/around-desktop.tex" file, that was a merge that failed in my pull/commit/push. I cleaned up three different spots where the merge failed. This is a different failed merge, though I don't know if it is in the same or a different spot in the file.

I don't know weather or not this is related to these problems, but in the pull/commit/push that caused my problem, there was a lock on the branch. Normally I would have waited a little while for the lock to be removed, but as the branch had been lock for 64 minutes, so I manually broke the lock.