Update old files with working code.
Fix merge problems.
Merge branch.