Remove ">>>>" markers left over from merge
1 file changed