Resolve Surface conflict.