Fix merger on rails4