trying to merge devise & master