Controller ready
Fixed view-controller merge