fix type, removed junk merge .orig file