mysterious merge problems
added upstream changes