Test resolve confilct
resolved