add update action
resolved merge conflict
resolved merge conflict
Merge branch 'master' of https://github.com/mule-deer-2013/greenlight
deleted duplicate migration file
fix migrations