fixed css problem
fixed merge conflict
fixed conflict