Start work on ProcessManager
Fix small conflict in Process Manager.