Effective Software Merging in the Presence of Object-Oriented Refactorings