fixed merge conflicts
fixed missionControl bugs