minor changes
resolving conflict in rope project files