adding welcome view (need to only show this on first load)
fix merge conflict