allow relative paths in project file names
merge resolution