fixed overriden merge