attempt to resolve merge conflict between rails4 and 99dcfae