remove conflict markers
Merge remote-tracking branch 'origin/4.6'