merge conflict and changes to sighting orm config