App link fixed
Merge conflict fixed: .DS_Store