jliew
committed
on 30 Jun 09
Remove some old conflict markers