update compiled versions, remove leftover merge orig files