Getting back erb file, was edited in another branch