working merge - again