comments and releasenotes.txt
fix conflicts