fixed up merge issues