rope project
db changes
finishing manual merge