Add code for future conflict