merged in bri and richa twitter search
deleted merge conflict sprocket