Fix issue 1: conflict message not appearing.