Merge from trunk and resolve conflicts.