merge with rails plugin generator