fix merge errors

...ta_alias/basic/2019.2/AditoBasic/create_ab_loghistory.xml

.liquibase/Data_alias/basic/2019.2/changelog.xml

entity/LogHistory_entity/LogHistory_entity.aod

neonView/LogHistoryFilter_view/LogHistoryFilter_view.aod

neonView/PersonMain_view/PersonMain_view.aod

others/db_changes/data_alias/basic/init/init.xml

others/db_changes/system_alias/struct/create_asys_audit.xml

...ces/_____PREFERENCES_PROJECT/_____PREFERENCES_PROJECT.aod

process/Loghistory_lib/Loghistory_lib.aod

process/process_audit/process_audit.aod