DIFFERENCING AND MERGING OF SOFTWARE DIAGRAMS - State of the Art and Challenges Topics: Software Architectures; Software Maintenance In Proceedings of the Second International Conference on Software and Data Technologies - Volume 1: ICSOFT, 90-99, 2007 , Barcelona, Spain