display the top 500 line of merge error

Signed-off-by: Oliver Pinter <oliver.pntr@gmail.com>
errr... fixed wrong place

Signed-off-by: Oliver Pinter <oliver.pntr@gmail.com>