fixed some wrong merge