Rails4 rebase