fix(conflict): fixed some code from merge conflict