fix border
merging