fix conflicts 3