Dashboard beginning
conflicts correction