add design for user
merge resolution