Did proper merge of david and raven's changed