Add back no conflict file