before trying to merge again