rake update database delete
Trying to fix the master
Merge branch 'map-ui' of https://github.com/csmalin/DangerZone
Merge branch 'master' of https://github.com/csmalin/DangerZone
Merge branch 'master' of https://github.com/csmalin/DangerZone
Merge branch 'master' of https://github.com/csmalin/DangerZone
Fixed merge conflicts
Merge branch 'master' of https://github.com/csmalin/DangerZone
Test
fix merge conflict
Resolved merge conflict,Safety score logic works
Fixing merge conflicts
Fixing the merge conflicts