Add SQUID Controller GUI merged unconflicted parts