moved imports from top of file to in function
merge resolution
bold source now replaces datasource