modified files after merge from upstream