Configuring controller and client
recommit for merge