yaffs Fixed a git merge conflict.