Test resolve conflict