@inproceedings{ICSME-2017-McKee0SD,
	author        = "Shane McKee and Nicholas Nelson 0002 and Anita Sarma and Danny Dig",
	booktitle     = "{Proceedings of the 33rd International Conference on Software Maintenance and Evolution}",
	doi           = "10.1109/ICSME.2017.53",
	isbn          = "978-1-5386-0992-7",
	pages         = "467--478",
	publisher     = "{IEEE Computer Society}",
	title         = "{Software Practitioner Perspectives on Merge Conflicts and Resolutions}",
	year          = 2017,
}