refactoring/merge problem fixed