Rails4 merge