Solving the merge after the rebase.
..