displaying error and suceess message
Merge origin/master