Fixed merge conflict from previous commit

Fixed merge conflict from previous commit