merging old file to new one, the new one has devise and cancan implemented