try resolving pull
Merge branch 'master' of https://github.com/Swquenzer/acid_rain.git
added error message to table if the query fails