added design slided
resolve merge conflict