Fix indendation, remove verbose merge