remove conflicts#25oct