Added back missing patches/merge problems.