Modif jobcontroller
Resolution merge