@inproceedings{ECMFA-2011-BarrettCB,
	author        = "Stephen Barrett and Patrice Chalin and Greg Butler",
	booktitle     = "{Proceedings of the Seventh European Conference on Modelling Foundations and Applications}",
	doi           = "10.1007/978-3-642-21470-7_23",
	isbn          = "978-3-642-21469-1",
	pages         = "329--344",
	publisher     = "{Springer International Publishing}",
	series        = "{Lecture Notes in Computer Science}",
	title         = "{Table-Driven Detection and Resolution of Operation-Based Merge Conflicts with Mirador}",
	volume        = 6698,
	year          = 2011,
}