Navigating through Changes and Conflicts in Projects