fixed some merged issues