adding text alerts?
conflict fixing