fixed some merged code