@inproceedings {260459,
	author = {Puneet Kumar and M. Satyanarayanan},
	title = {Flexible and Safe Resolution of File Conflicts},
	booktitle = {USENIX 1995 Technical Conference (USENIX 1995 Technical Conference)},
	year = {1995},
	address = {New Orleans, LA},
	url = {https://www.usenix.org/conference/usenix-1995-technical-conference/flexible-and-safe-resolution-file-conflicts},
	publisher = {USENIX Association},
	month = jan
}
