Done editing the last merge