fix some conflicts (Re #879)
add MissionFacility content type (re #879)