A computer-implemented method of automatically upgrading a software application resident on at least one computer from a user modified prior version thereof to an upgrade user modified version thereof, the software application having a plurality of business objects, wherein each of the plurality of business objects is associated with at least one object attribute, the method comprising one or more computing devices carrying out the steps of: a) collecting object attributes from repositories that store the object attributes, the object attributes being associated with business objects in each of: i) an unmodified prior version of the software application, ii) the user modified prior version, and iii) an upgrade version of the software application; b) comparing the object attributes between: i) corresponding business objects in the user modified prior version and the unmodified prior version to result in a first set of differences between business objects, and ii) corresponding business objects in the upgrade version and the unmodified prior version to result in a second set of differences between business objects; c) automatically identifying which differences of the first set of differences and the second set of differences are conflicting, and which of the differences are compatible; d) displaying the first and second set of differences in a graphical user interface that provides access to and editing of the plurality of business objects, wherein the graphical user interface supports visual comparison of the first and second set of differences, and is configured to show an administrator the conflicting differences of the first and second set of differences together with an indication of a default resolution of each conflict defined by conflict resolution rules, the graphical user interface further providing functionality enabling the administrator to override the default resolution of the conflicting differences; and e) automatically applying the differences by merging changes made to the unmodified prior version to provide the upgrade user modified version for the computer, wherein applying the conflicting differences comprises applying said conflict resolution defined on a per object basis. a) collecting object attributes from repositories that store the object attributes, the object attributes being associated with business objects in each of: i) an unmodified prior version of the software application, ii) the user modified prior version, and iii) an upgrade version of the software application; i) an unmodified prior version of the software application, ii) the user modified prior version, and iii) an upgrade version of the software application; b) comparing the object attributes between: i) corresponding business objects in the user modified prior version and the unmodified prior version to result in a first set of differences between business objects, and ii) corresponding business objects in the upgrade version and the unmodified prior version to result in a second set of differences between business objects; i) corresponding business objects in the user modified prior version and the unmodified prior version to result in a first set of differences between business objects, and ii) corresponding business objects in the upgrade version and the unmodified prior version to result in a second set of differences between business objects; c) automatically identifying which differences of the first set of differences and the second set of differences are conflicting, and which of the differences are compatible; d) displaying the first and second set of differences in a graphical user interface that provides access to and editing of the plurality of business objects, wherein the graphical user interface supports visual comparison of the first and second set of differences, and is configured to show an administrator the conflicting differences of the first and second set of differences together with an indication of a default resolution of each conflict defined by conflict resolution rules, the graphical user interface further providing functionality enabling the administrator to override the default resolution of the conflicting differences; and e) automatically applying the differences by merging changes made to the unmodified prior version to provide the upgrade user modified version for the computer, wherein applying the conflicting differences comprises applying said conflict resolution defined on a per object basis.