more solutions and fixed merge issue