fix: all merge fails fixed