Disable devise/make info popup nicer
resolved conflicts