ignore storyboard
git ignore master
merge
merge
merge
master merge