placeholder for join and create views
merge conflict