-- changed prop file config
--conflict resolution