small work on comms
db merge conflicts