Resolve merge conflict and add design refinement