Deleted accidentally added .orig files following solving merge conflicts