fix that problem and merge