fixed changed made during manually resolution