fixed merge and led