Merged SynFind conflict.