Operation-based conflict detection and resolution. - Maximilian Koegel; Jonas Helming; Stephan Seyboth (CVSM@ICSE, 2009)