remove conflict data
format the code
remove unuse dtat
use pg gem
modified