Fixing up merge issues
merging