updates to utilities
fixed merge conflicts in utilities.h