Few alterations and suggestions
resolved conflict
resolved conflict