Some issue with the merge... SOLVED