removing dist
removing dist
merging main controller