Fixed fringe condition
fixed merge