added the controller file
fixing conflicts