[freerdp/el5] Fix merge conflict markers