dashboard redesign
conflicts