Rails4 merge issues