The merge was done wrong. Solving the problem