No conflicts anymore

No conflicts anymore