Implemented internal conflict resolution rules