postgres and restructure
Conflict fixes