changed alert title
Merge branch 'dev' into feature-branch
fixed merge conflict