dashboard working
fixes merge conflict