chiark / gitweb /
merge conditions into conditions