afte rmerge cleenup