fix conflicts 2