Software Practitioner Perspectives on Merge Conflicts and Resolutions

10-page technical paper submitted to ICSME 2017. Presented at the International Conference on Software Maintenance and Evolution (ICMSE) in Shanghai, China from September 17-24, 2017. Received IEEE TCSE Distinguished Paper Award.