BUG: Fixed merge conflict
BUG: Fixed merge conflict

josephsnyder/journal,midasplatform/journal,midasplatform/journal,BetsyMcPhail/journal,josephsnyder/journal,josephsnyder/journal,BetsyMcPhail/journal,josephsnyder/journal,midasplatform/journal,midasplatform/journal