Update files so datasource will start.
Fix merge conflict.