Change file according authours guidlines
Merge branch 'NSError-alert'