osanna edits
conflicts fixed