Rails 4

I am merging major dev work done in an external repo to the main repo, on the same branch.