cleaned up merge issues