Conflict solved

The code conflict that appeared as the two branches were merged now is solved.