fix empty line space due to merge