how to reconnect after conflict