removed rails conflict