Apparently I can't resolve merge conflicts.
Apparently I can't resolve merge conflicts.

spotify/ramlfications,econchick/ramlfications,postatum/ramlfications,jmagnusson/ramlfications,jenner/ramlfications,underarmour/ramlfications,jasonrhaas/ramlfications